@eyedeekay
&zzz
+R4SAS
+RN
+RN_
+Stormycloud
+cumlord
+dr|z3d
+eche|off
+mareki2p
+postman
+qend-irc2p
+snex
AHON1
Arch
BravoOreo
BubbRubb
Chrono
Danny
FreeRider
FreefallHeavens
HowardPlayzOfAdmin
Irc2PGuest28321
Irc2PGuest28800
Irc2PGuest70215
Irc2PGuest9896
Onn4l7h
Over
Sisyphus
Sleepy
SlippyJoe_
T3s|4
T3s|4_
Teeed
acetone_
b3t4f4c3___
bak83
dr4wd3
duanin2
eyedeekay_bnc
leopold
makoto
nilbog
not_bob_afk
ohThuku1
orignal_
poriori_
pory
profetikla
r00tobo
rapidash
shiver_
solidx66
thetia
tr
u5657
uop23ip
w8rabbit
wew
white
wodencafe2
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