@eyedeekay
&eche|on
&zzz
+R4SAS
+RN
+RN_
+StormyCloud
+acetone
+cumlord
+eche|off
+hagen
+orignal
+postman
+qend-irc2p
+snex
+wodencafe
Arch
Birdy
BubbRubb
Chrono
Danny
DeltaOreo
FreefallHeavens
Irc2PGuest3790
Irc2PGuest40504
Irc2PGuest71037
Irc2PGuest79872
Irc2PGuest88641
Irc2PGuest90909
Irc2PGuest92550
Irc2PGuest9448
Onn4l7h
Onn4|7h
Over1
Sisyphus
Sleepy
SlippyJoe
Stormycloud_
T3s|4_
T3s|4__
Teeed
aargh2
ac9f
b3t4f4c3__
bak83
dr4wd3
dr|z3d
duanin2
eyedeekay_bnc
nilbog
not_bob_afk
poriori
profetikla
r00tobo
rapidash
shiver_
solidx66_
thetia
u5657
uop23ip
w8rabbit
x74a6
zzz
how can I see where a merge conflict is? (PR 512) It says build.xml but what lines?
eyedeekay
What I usually do is pull the master branch into the working branch (git pull origin master --no-rebase) which will then mark the merge conflict in the build.xml file with a section delimited by >>>>> or <<<<<
eyedeekay
I will see if there is an easier way to just get the info without pulling in the master
eyedeekay
`git checkout master && git merge zzz-jetty12 --no-ff --no-commit`
zzz
ok thanks
zzz
think I'll start by just a straight diff between the two files in my two workspaces
zzz
oh it's tomcat
zzz
the jetty 12 branch is on 9.0.88 but I updated master to 9.0.107 two months ago
zzz
pushed, lets see if that gets rid of the conflict
zzz
eyedeekay, in between repeated 503s and resets, the new rev isn't visible in the PR
zzz
this is really on the verge of being unusable
eyedeekay
I saw, am working on it
zzz
thx