@eyedeekay
&eche|on
&zzz
+R4SAS
+RN
+RN_
+Stormycloud
+T3s|4
+acetone
+dr|z3d
+eche|off
+mareki2p
+orignal
+postman
+qend-irc2p
+snex
+wodencafe
Arch
BubbRubb
Chrono
Daddy
Dann
DeltaOreo
Irc2PGuest22388
Irc2PGuest25042
Irc2PGuest43747
Irc2PGuest68968
Irc2PGuest70600
Irc2PGuest74352
Onn4l7h
Over1
Sisyphus
Sleepy_
T3s|4_
Teeed
aargh1
ac9f
b3t4f4c3__
bak83_
combed_tree328
coolbuddy799
cumlord
dr4wd3_
duanin2
leopold
makoto
not_bob_afk
poriori
profetikla
r00tobo
rapidash
shiver_
solidx66
thetia
tr
u5657
uop23ip
vivid_reader56
w8rabbit
x74a6
xHarr
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