How to force manual merging in Git / IntelliJ if same file but different lines were edited? -

-

i not sure whether git or intellij problem facing. assuming following using git integration in intellij:

  1. user changes text file , commits , pushes change branch branch1

  2. user b changes same text file but in different line , commits branch1

  3. user b fetches remote repository , merges remote branch1 local branch1

current behavior: merges wihout conflicts (since different lines?)

wanted behavior: conflict resolution window popups , user must decide whether apply none conflicting changes.

but why might want behvaior?: had troubles markup or js files, 1 developer changed @ top (e.g. removed unused function) , developer relying on this. 1 must have costly ui tests if want informed breaks. if markup (e.g. jsf tags, params)

i not sure if want, use --no-commit option of git merge command pretend merge failed when there no conflicts. manual:

with --no-commit perform merge pretend merge failed , not autocommit, give user chance inspect , further tweak merge result before committing.

then, can inspect changes git diff --cached option inspect results of merge; , use git checkout options --ours , --theirs accept or refuse changes introduced merge.


Comments

Post a Comment

Popular posts from this blog

google api - Incomplete response from Gmail API threads.list -

-
i plot number of emails in inbox on time using gmail api , i'm seeing lot of drop-outs, whatever reason i'm getting incomplete count of messages @ single time points. my plots here: https://plot.ly/~tdsmith/2 -- "drop-outs" i'm complaining trace shoots downwards , recovers previous level @ next timepoint. the code i'm using count emails here: https://github.com/tdsmith/gmail-plotly/blob/master/gmail-plotly.py#l47-l64 what can diagnose these faults?
Read more

Installing Android SQLite Asset Helper -

-
i need use ready made database. search solution on internet did not work until decided use mentioned library found here . however, found hard use library in installation procedures shallow beginners. i appreciate step step procedure on how use android studio. in struggle tried copying sources main/libs , adding line gradle did not work. use api 19 if helps. update here build.gradle // top-level build file can add configuration options common sub-projects/modules. buildscript { repositories { mavencentral() } dependencies { classpath 'com.android.tools.build:gradle:0.11.+' compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:+' // note: not place application dependencies here; belong // in individual module build.gradle files } } allprojects { repositories { mavencentral() } } trying compile project error error:(9, 0) no signature of method: org.gradle.api.internal.artifacts
Read more

Qt Creator - Searching files with Locator including folder -

-
one quick question qtcreator : know possible use locator open files using "ctrl-k" shortcut. however, possible search files including locations? for example, let's want locate file named "main.cpp" in folder named "myfolder" , have lots of other main.cpp files. what should type locator in order open ? just type myfolder/main.cpp in locator
Read more