git - Merged commits listed as unmerged in branch diff -


consider repo following branches:

master: a-b-c-d-e

development: a-b-c-d-e-f-g

when run git log master..development --oneline receive following: 

c <hash> <commit message>  d <hash> <commit message> e <hash> <commit message> f <hash> <commit message> g <hash> <commit message>

so though c d e in both branches, reported unmerged. furthermore, when attempt merge development master, duplicate commits, 1 original commit hash, , other new commit hash.

i've inherited repository , i'm wondering might have caused such issue, if should concerned, , best course of action is. need merge in new commits f g master , i'm trying figure out best approach keep things clean possible.

thanks in advance

while not entirely sure reason why happening, have idea on how can merge branches without creating these duplicates commits.

the solution use git cherry-pick. cherry-pick replay specific commits onto tip of current branch without regard commit history, works if commit can apply cleanly new branch (which should fine long both versions of c d e have same changes.

first, make sure on master branch. there, following command:

$ git cherry-pick f g

make sure f , g respective commits' hashes.

if command fails, willing bet c d e not same commits on both branches.

if want debug why might happening, useful post results of git log master..development, redacting information necessary.


Comments

Post a Comment

Popular posts from this blog

asynchronous - C# WinSCP .NET assembly: How to upload multiple files asynchronously -

i using winscp .net assembly uploading files. want upload multiple files asynchronous way. have created method works single upload. public class uploadingdata { private sessionoptions _sessionoptions; private session _session; //connection etc private void onconnected() { foreach (var fileinfo in localfileslist) { var task = task.factory.startnew(() => uploadfilesasync(fileinfo)); } } private async task uploadfilesasync(string file) { string remotefilepath = _session.translatelocalpathtoremote(file, @"/", "/test_data_upload"); var uploading = _session.putfiles(file, remotefilepath, false); //when done await task.run(() => thread.sleep(1000)); } } please suggest me correct way. thanks you can use backgroundworker class this: string[] images = new string[50]; foreach (var path in images) { backgroundworker
Read more

aws api gateway - SerializationException in posting new Records via Dynamodb Proxy Service in API -

i getting "__type": "com.amazon.coral.service#serializationexception" as reply in postman & in test console in api gateway trying post record directly dynamodb using api proxy services.. referring aws article - https://aws.amazon.com/blogs/compute/using-amazon-api-gateway-as-a-proxy-for-dynamodb/ here's mapping { "tablename": "tablenamegoeshere", "item": { "id" : "$context.requestid" "eventname" : "$input.path('$.eventname')", "timestamp" : $input.path('$.timestamp'), "answers": "$util.parsejson($input.path('$.answers'))" } } update: did asked ... , worked if try add array of json objects gives me above same error - here's trying now. please - couldnt find on google well #set($inputroot = $input.path('$')) { "tablename": "answer", "item": {
Read more

asp.net - Problems sending emails from forum -

i have been redesigning site has message board, has been written guy looked after site. it has few problems , written in .asp , uses .mdb files database. you can see whole thing here . feel free post if helps, test thing have set using original files , new database. the basic problem when posts message, supposed email sent them, have posted it. when replies, originator supposed message, replier has been posted. i’d have thought @ point in process there should script/file in postmessage.asp? the postmessage.asp page below. <% option explicit %> <!-- #include virtual="common/adovbs.inc" --> <html> <head> <meta http-equiv="content-type" content="text/html; charset=windows-1252"> <meta name="generator" content="microsoft frontpage 4.0"> <meta name="progid" content="frontpage.editor.document"> <title>new page 2</title> <base target="_self"
Read more