&zzz
+FreefallHeavens
+R4SAS
+RN_
+Romster
+acetone
+eche|off
+mareki2p
+nilbog
+nyaa2pguy
+postman
+qend-irc2p
+wodencafe
Arch
Danny
Irc2PGuest15434
Irc2PGuest16019
Irc2PGuest20377
Irc2PGuest33925
Irc2PGuest35412
Irc2PGuest48148
Irc2PGuest77921
MatrixBot
NiceBoat
Onn4l7h
Onn4|7h
Over
Sisyphus
T3s|4_
Teeed
aargh4
ahiru
ananas
anontor2
b3t4f4c3__
cims
dr4wd3_
duanin2
ice_juice
mahlay
makoto
marek
n2
noidea
not_bob_afk2
o3d3
orignal
poriori
profetikla
r00tobo
rapidash
rednode
sahil
solidx66
stormycloud[m]
sublimia
test7363673
uop23ip
urist_
vivid_reader56
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