@eyedeekay
&eche|on
&zzz
+R4SAS
+RN
+RN_
+StormyCloud
+T3s|4
+acetone
+dr|z3d
+eche|off
+orignal
+postman
+qend-irc2p
+snex
+weko
+wodencafe
Arch
BubbRubb
Chrono
Danny
DeltaOreo
FreefallHeavens
HowardPlayzOfAdmin
Irc2PGuest38175
Irc2PGuest62240
Irc2PGuest64908
Irc2PGuest77933
Irc2PGuest87067
Irc2PGuest88693
Sleepy
SlippyJoe_
T3s|4_
Teeed
aargh2
ac9f
b3t4f4c3__
bak83
cumlord
death
dr4wd3
duanin2
eyedeekay_bnc
idk_afk
leopold
makoto
nilbog
not_bob_afk
poriori_
profetikla
r00tobo_BNC
rapidash
shiver_sc
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