&zzz
+FreefallHeavens
+R4SAS
+RN
+StormyCloud
+T3s|4
+acetone
+cims
+eche|off
+fa
+mareki2p
+nilbog
+orignal
+postman
+qend-irc2p
+rednode
+snex
+wodencafe
Arch
Danny
Irc2PGuest28384
Irc2PGuest66257
Irc2PGuest75631
Irc2PGuest81267
Onn4l7h
Onn4|7h
Over
ReturningNovice
Sisyphus_
Sleepy
T3s|4_
U1F642
Watson
Zapek
aargh4
ahiru
ananas
anontor
calamares
dr4wd3
dr|z3d
duanin2
i2potus
ice_juice
justaperson
luvme
mahlay
makoto
marek22k
n2_
not_bob_afk
onon_
pinotto
poriori
profetikla
psychopuck
r00tobo
rapidash
test7363673
uop23ip
w8rabbit
x74a6
zelgomer
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