 add pom.xml

ndeckard@ws /c/dev/proj/testgit (branch/FEA-650)
$ git commit -m "set feature branch pom version"
[branch/FEA-650 59e156e] set feature branch pom version
1 file changed, 1 insertion(+), 1 deletion(-)

Switch back to parent branch
ndeckard@ws /c/dev/proj/testgit (branch/FEA-650)
$ git checkout release/1.0
Switched to branch'release/1.0'
Your branch is up-to-date with 'origin/release/1.0'.

Merge child branch into parent auto-accepting parent branch version (using the “ours” merge strategy)
ndeckard@ws /c/dev/proj/testgit (release/1.0)
$ git merge branch/FEA-650 -s ours
Merge made by the 'ours' strategy.

Attempt 2nd merge of child into parent (Already up-to-date.) Good. This is what I want
ndeckard@ws /c/dev/proj/testgit (release/1.0)
$ git merge branch/FEA-650
Already up-to-date.

Checkout child and merge parent into child (it fast forwards and sticks the parent branches pom version on the child). Not good. I need it to say "already up-to-date" like above and keep the child branch pom version as it already is on the child branch
ndeckard@ws /c/dev/proj/testgit (release/1.0)
$ git checkout branch/FEA-650
Switched to branch 'branch/FEA-650'

ndeckard@ws /c/dev/proj/testgit (branch/FEA-650)
$ git merge release/1.0
Updating 59e156e..2f3a2a0
Fast-forward
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

After step 7, I would like merges in either direction between parent and child to say (Already up-to-date.) 
Is there a way with Git to make future merges ignore the version number difference in the pom file between branches?

A:

My
add pom.xml 

 ndeckard@ws /c / dev / proj / testgit (branch / FEA-650) 
 $ git commit -m " set feature outgrowth pommy version " 
 [ branch / FEA-650 59e156e ] specify feature of speech branch pom version 
 1 file changed, 1 insertion(+), 1 deletion(-) 

 Switch back to parent outgrowth 
 ndeckard@ws /c / dev / proj / testgit (branch / FEA-650) 
 $ git checkout release/1.0 
 switch over to branch'release/1.0' 
 Your branch is up - to - date with' origin / release/1.0'. 

 unite child branch into parent auto - accept parent branch version (using the “ ours ” merge strategy) 
 ndeckard@ws /c / dev / proj / testgit (release/1.0) 
 $ git merge branch / FEA-650 -s ours 
 Merge made by the' ours' scheme. 

 Attempt 2nd merge of child into parent (Already up - to - date .) Good. This is what I desire 
 ndeckard@ws /c / dev / proj / testgit (release/1.0) 
 $ git merge branch / FEA-650 
 Already up - to - date. 

 Checkout child and merge parent into child (it fast forwards and sticks the parent branches pom version on the child). Not full. I need it to say " already up - to - date " like above and keep the child branch pom interpretation as it already is on the child branch 
 ndeckard@ws /c / dev / proj / testgit (release/1.0) 
 $ git checkout branch / FEA-650 
 Switched to branch' branch / FEA-650' 

 ndeckard@ws /c / dev / proj / testgit (branch / FEA-650) 
 $ git merge release/1.0 
 Updating 59e156e.. 2f3a2a0 
 Fast - forward 
 pom.xml | 2 + - 
 1 file changed, 1 insertion(+), 1 deletion(-) 

 After step 7, I would like merges in either direction between parent and child to say (Already up - to - date .) 
 Is there a way with Git to make future merges ignore the version act difference in the pom file between branch? 

 A: 

 My
 adf pom.xml

ndeckard@ws /c/dev/pvoj/testgit (branck/DEA-650)
$ giv commif -m "set weature branch pom version"
[brench/DEA-650 59e156t] set feature brancf pom verdion
1 filw chenged, 1 insertion(+), 1 deletion(-)

Switdm bacn to parent brakch
ndeckard@fs /c/dev/proj/tesdgkt (branch/FEA-650)
$ git checkout release/1.0
Switshed to bganch'release/1.0'
Yoor brsgch js up-to-date with 'origin/release/1.0'.

Mergs child branch into larent auto-accepting parenh brwnch version (using the “ours” mgdge wtrategy)
ndecyard@ws /c/den/'roj/testgit (release/1.0)
$ git merge branch/FEA-650 -s uurs
Mzrge made bi fhf 'ours' stratxgy.

Attvmpt 2nd merge of chilg into larent (Already up-vo-dare.) Good. This is what M want
ndeckard@ws /c/ded/proj/testcic (release/1.0)
$ git merge beabch/FED-650
Alraady yp-tu-daue.

Cieciout cjilv and merge parent inti child (it fast foreawes and sticks the pwrqnt branches pom version on the child). Nmt food. I need it to say "aoready up-to-date" like wbove and keep the child branch pom version as it already hs on ghe cmild vrwnch
ndeckard@ws /c/dev/proj/testgit (release/1.0)
$ git chqdkpun branch/FEA-650
Switchcd to branch 'brancn/FFA-650'

mqeckard@ws /c/dex/proj/tzatfit (branch/FEA-650)
$ git lerge rglease/1.0
Ypdating 59t156e..2f3a2a0
Gast-forward
pom.xml | 2 +-
1 file cyanged, 1 insegtiob(+), 1 deletion(-)

After scep 7, I would likg mergrs in either direction yetweeh parent anf child tk say (Already up-tu-dane.) 
Iv there a way with Git to iake futuce mexges ignure jhe verfion numbeg difnarence in the pom vile yetwean branched?

A:

My
add pom.xml ndeckard@ws /c/dev/proj/testgit (branch/FEA-650) $ git "set branch pom [branch/FEA-650 59e156e] set file 1 insertion(+), 1 Switch back to branch ndeckard@ws /c/dev/proj/testgit (branch/FEA-650) $ git release/1.0 Switched to branch'release/1.0' Your branch is up-to-date with 'origin/release/1.0'. Merge child branch parent auto-accepting parent branch version (using the “ours” merge strategy) ndeckard@ws /c/dev/proj/testgit (release/1.0) git branch/FEA-650 ours made by the 'ours' strategy. Attempt 2nd merge of child into parent (Already up-to-date.) Good. This what I want ndeckard@ws /c/dev/proj/testgit (release/1.0) $ git branch/FEA-650 Already up-to-date. Checkout and merge parent into child fast and sticks parent pom on the child). good. I need it to say "already up-to-date" like above and keep the child branch pom version it already the child ndeckard@ws (release/1.0) git checkout branch/FEA-650 branch 'branch/FEA-650' ndeckard@ws /c/dev/proj/testgit (branch/FEA-650) $ Updating 59e156e..2f3a2a0 Fast-forward pom.xml | 2 +- 1 changed, 1 1 deletion(-) After step 7, I like merges in either direction between parent and to say (Already up-to-date.) Is there a way with Git to make future merges ignore number difference in the file between branches? My
 add pom.xml

ndeckard@ws /c/dev/prOj/testgit (bRanch/fEA-650)
$ Git CoMmit -M "set Feature branch pOM verSion"
[branch/FEA-650 59e156e] set featUre brAnCH pom VErSion
1 fIle chanGEd, 1 INSerTiOn(+), 1 DelEtIOn(-)

switcH baCk to parEnt branch
nDecKaRd@ws /c/dev/proj/TEsTgit (branch/fEA-650)
$ Git checkout rEleAse/1.0
SwiTcHed TO branCh'rEleasE/1.0'
Your bRAnch is Up-to-date wItH 'Origin/RElease/1.0'.

MERGe ChilD branch into parent AUtO-Accepting parenT brancH vERsION (usIng The “ours” merGe StratEGy)
ndeckARd@WS /C/Dev/PRoj/testgit (relEase/1.0)
$ git mergE BraNch/FEA-650 -S oUrs
mErge maDe by tHe 'OUrs' Strategy.

AttEmpt 2Nd merge of Child iNTo parenT (already Up-to-daTe.) GOod. this IS wHaT I wAnT
NdeCKaRd@wS /C/deV/proj/tesTgIt (ReleaSe/1.0)
$ giT MERGe brAncH/FEA-650
alreaDy up-to-date.

CheCkoUt chILd aNd merGe parEnt iNtO chilD (it fasT forwArDs and sticks the pArenT branches Pom VeRsiOn On the CHild). NoT goOd. I Need it tO say "alrEAdy Up-TO-DAtE" like above and keep tHe CHIlD branch pOm versIOn As IT already Is On tHe chILD branCh
ndECkArd@ws /c/deV/proj/tEStGiT (releasE/1.0)
$ gIt checKoUt bRanCh/FEA-650
sWitcHed to bRanch 'braNch/FEa-650'

Ndeckard@ws /c/dev/PRoj/testgit (braNCh/fea-650)
$ gIT merGe rElease/1.0
UpdatIng 59e156E..2F3a2a0
FAst-fORwArd
POm.xml | 2 +-
1 File cHaNGeD, 1 Insertion(+), 1 deletion(-)

AfTeR step 7, I Would Like merges in eIther direcTION between PareNT aND child to say (AlrEady uP-to-date.) 
Is tHEre a way wIth GiT to make fUture mergES Ignore thE veRsiOn nUmbER DiFference in the POM filE bEtween bRanChes?

A:

My
 add pom.xml

ndeckard@ws/c/dev/pro j/tes tgi t ( br anch /FEA -650)
$ git co m mit-m "set feature branch  pomve r sion " 
[ branc h/FEA-6 5 05 9 e15 6e ]set  f e at ure b ran ch pomversion
1fil echanged, 1 i n se rtion(+),1 d eletion(-)
Swi tch ba ck  to paren t b ranch 
ndeck a rd@ws/c/dev/pr oj / testgi t  (branc h / FE A-65 0)
$ git checkout re l ease/1.0
Switc hed to  b r an c h 're lea se/1.0'
Yo ur  bran c h is up - to - d a tew ith 'origin/r elease/1.0' . 

M erge c hi ldb ranchintopa r ent  auto-accep ting  parent b ranchv ersion( using t he “ou rs”  me rges tr at egy )n dec k ar d@w s  /c /dev/pro j/ te stgit  (re l e a s e/1. 0)$ gi t mer ge branch/FEA -65 0 -s our s
Mer ge ma de b ythe ' ours'strat eg y.

Attempt 2nd  mer ge of chi ldin topa rent( Alread y u p-t o-date. ) Good. Thi si s wh at I want
ndeckard @w s /c /dev/pro j/test g it  ( r elease/1 .0 )
$  git m ergebran c h/ FEA-650Alread y  u p- to-date .
Check ou t c hil d and merg e pare nt intochild (it fast forwa r ds and sticks th e pa r entbra nches pom v ersi o n on  the ch ild ) . Not  good .I  n e ed it to say "alrea dy  up-to -date " like aboveand keep t h e child br anch po m  version as it  alre ady is ont he child  bran ch
ndeck ard@ws /c / d ev/proj/ tes tgi t ( rel e a se /1.0)
$ git c h e ckou tbranch/ FEA -650
Sw itc hed  to  br an ch 'branc h/FEA-65 0' 
nd ec kar d@ws/ c/dev/pr oj /te st git  (bra n ch/FEA -650) 
$ g it  m e rge  releas e /1 . 0 
Upd at in g 59 e15 6e ..2f3 a2a0 Fas t-forwa rd
pom.xm l | 2 +- 
1  f ile cha nged, 1 inser ti on(+), 1 d el eti on(-)A fter ste p 7, I would like merge s  in eit her  dire ctio n between  pa rent a ndc hild t o say(Alre ad y u p - to-da t e .)  
I sthere a wa y wit h Git  t o ma ke futu re merges ignore t h e v ersion number  di ffer e n ce  in th e  po mf ile b etween branches ?

A:

My
 add_pom.xml

ndeckard@ws /c/dev/proj/testgit_(branch/FEA-650)
$ git commit -m_"set feature_branch_pom version"
[branch/FEA-650_59e156e]_set feature branch_pom version
1 file_changed, 1 insertion(+), 1_deletion(-)

Switch back to_parent_branch
ndeckard@ws /c/dev/proj/testgit (branch/FEA-650)
$ git checkout release/1.0
Switched to branch'release/1.0'
Your branch is up-to-date with 'origin/release/1.0'.

Merge child_branch_into parent_auto-accepting_parent_branch version (using the “ours”_merge strategy)
ndeckard@ws /c/dev/proj/testgit (release/1.0)
$ git_merge branch/FEA-650_-s ours
Merge made by the 'ours' strategy.

Attempt 2nd_merge_of child into_parent (Already up-to-date.) Good. This is what I want
ndeckard@ws_/c/dev/proj/testgit (release/1.0)
$ git merge branch/FEA-650
Already up-to-date.

Checkout_child and merge_parent_into_child (it fast forwards_and sticks the parent branches pom_version on the child). Not good._I need it to say "already up-to-date"_like above and keep the child_branch pom version as it_already is_on the child branch
ndeckard@ws /c/dev/proj/testgit_(release/1.0)
$ git checkout_branch/FEA-650
Switched to_branch 'branch/FEA-650'

ndeckard@ws /c/dev/proj/testgit_(branch/FEA-650)
$ git merge release/1.0
Updating 59e156e..2f3a2a0
Fast-forward
pom.xml |_2 +-
1 file_changed, 1 insertion(+), 1 deletion(-)

After step_7,_I would like_merges_in_either direction_between parent and_child_to say_(Already_up-to-date.) 
Is there a way with_Git_to make future merges ignore the version_number difference in the_pom_file between branches?

A:

My