git - Re-merging after "Selective" or "Partial" Merge -

-

here's reproducible example of problem i've gotten myself into:

setup

mkdir test-git cd test-git git init echo 'hello, world.' > file1.txt git add . git commit -m 'init commit' git branch branch2 git checkout branch2 echo 'hello, universe' > file1.txt echo 'foobar' > file2.txt git add . git commit -m 'commit 2'

i wanted merge branch2 master changes file1.txt, here's did:

git checkout master git merge branch2 --no-commit --no-ff git reset -- file2.txt git commit -m 'partially merged branch2 master!'

so here's realized might not have been idea... let's changed mind , want merge file2.txt in well. can run:

git merge branch2

response: up-to-date.

if run git diff branch2 --name-status returns d file2.txt, guess when unstaged file2.txt tracked deletion? still don'y understand why can't merge on , wouldn't add file (i don't understand git's merge algorithm well).

unfortunately, scenario more complicated can't reverse commit. there easy way remerge differences between master , branch2, without rewriting history?

in git merge commit supposed have necessary changes parents. if committer deliberately decided pick version of file did, resulting commit considered "a right merge" , it's impossible perform "further merge".

this behavior has reasons. suppose 1 makes additional change file2.txt in branch2 after 1st merge commit, , perform merge of branch2 master (a quite typical situation, isn't it?). should considered correct state of file2.txt. expect second merge should contain changes made between 2 merges, right? desire other behavior, when git collects changes file2.txt unapplied far since beginning of history. quite annoying.

nevertheless can "alternative merge". is, jump commit before merge on master branch (in example, 'init commit') , issue git merge once again.

if history rewriting isn't appropriate needs, might create new branch b3 @ commit, perform merge, , merge b3 master. definitely, receive merge conflict on file2.txt , should resolve providing "proper variant" it.


Comments

Post a Comment

Popular posts from this blog

java - nested exception is org.hibernate.exception.SQLGrammarException: could not extract ResultSet Hibernate+SpringMVC -

-
i trying fetch records database , having above error this classs appropriate getters , setters public class user { private int id; private string username; private string password; private string email; i have create database , inserted data below configuration <bean id="datasource" class="org.apache.commons.dbcp2.basicdatasource" destroy-method="close"> <property name="driverclassname" value="com.mysql.jdbc.driver"/> <property name="url" value="jdbc:mysql://localhost:3306/usersdb"/> <property name="username" value="root"/> <property name="password" value=""/> </bean> this complete stacktrace severe: servlet.service() servlet [appservlet] in context path [/spring] threw exception [request processing failed; nested exception org.hibernate.exception.sqlgrammarexception: not ...
Read more

sql - Postgresql tables exists, but getting "relation does not exist" when querying -

-
Image
i have postgresql db number of tables. if query: select column_name information_schema.columns table_name="my_table"; i list of columns returned properly. however, when query: select * "my_table"; i error: (programmingerror) relation "my_table" not exist 'select *\n "my_table"\n' {} any thoughts on why can columns, can't query table? goal able query table. you have include schema if isnt public one select * <schema>."my_table" or can change default schema show search_path; set search_path my_schema; check table schema here select * information_schema.columns for example if table on default schema public both works ok select * parroquias_region select * public.parroquias_region but sectors need specify schema select * map_update.sectores_point
Read more

asp.net mvc - breakpoint on javascript in CSHTML? -

-
i have .cshtml file has javascript tag. within script tag have few lines of javascript. first line of javascript refers property in @viewbag. other javascript lines plain script without mvc related references. observation: can place breakpoints (visual studio 2015) on each of these javascript lines. however, breakpoints has white dot in center of breakpoint symbol (red circle) except line @viewbag reference (this particular line not have white dot in center). it seems breakpoint without white dot hit during run-time. question: can explain going on here? white dot mean? why plain red breakpoint line line hitting breakpoint? the visual studio debugger expecting debug actual server-side code within .cshtml file opposed client-side javascript within it. iirc, visual studio allow debug javascript code expected in internet explorer (and possibly edge), other browsers want use either third-party tool or developer tools (f12) within browser. an easy approach take advant...
Read more