&zzz
+Irc2PGuest22277
+RN
+StormyCloud
+T3s|4
+acetone
+cumlord
+dr|z3d
+mareki2p
+orignal
+postman
+qend-irc2p
+snex
Arch
Birdy
BubbRubb1
Chrono
Danny
DeltaOreo
Irc2PGuest44009
Irc2PGuest63096
Irc2PGuest63496
Irc2PGuest74254
Irc2PGuest8482
Irc2PGuest88931
Irc2PGuest93823
Irc2PGuest95708
Onn4l7h
Onn4|7h
Over1
Sisyphus
Sleepy
Teeed
aargh2
ac9f
anontor
b3t4f4c3___
dr4wd3
eyedeekay_bnc
leopold
makoto
n1
nilbog
not_bob_afk
onon_1
poriori_
profetikla
r00tobo
rapidash
shiver_
solidx66_
thetia
uop23ip_
vivid_reader56
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