@eyedeekay
&zzz
+FreefallHeavens_
+R4SAS
+RN_
+Romster_
+StormyCloud
+acetone
+cims
+hagen
+nilbog
+nyaa2pguy
+postman
+qend-irc2p
+rednode
+snex
Arch
Danny
FatherTime_
Holmes
Irc2PGuest14026
Irc2PGuest28384
Irc2PGuest37450
Irc2PGuest41497
OfficialCIA
Onn4l7h
Onn4|7h
Over
Sleepy
T3s|4_
U1F642
Zapek
aargh4
ac9f_
ahiru
anontor
calamares
dr4wd3
duanin2
eyedeekay_
eyedeekay_bnc
leopold
mahlay
makoto
marek
mareki2p_
n2
not_bob_afk2
orignal
orneodes
poriori
profetikla
r00tobo_BNC
rapidash
test3847473
uop23ip
urist_
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