Local branch on top remote

I a have a local branch called ABC. I would like to add all these changes on top the remote branch develop. I guess this is done with a merge. I have been searching and found out how to push my branch to the origin but how do I merge it on top of my already existing remote branch?

Answers


I assume the remote branch is called develop and you don't have any other develop branches:

git checkout develop
git merge ABC
# probably resolve conflicts and git commit
git push

Need Your Help

DatePicker to text on navigated in Windows Phone

c# xaml windows-phone-7 windows-phone-8 datepicker

I am trying to convert the date format to text but as it said it doesn't have that Text extension. How do I solve this part? Below are my codes

Getting total price for a ManyToManyField in Django

python django

I'm trying to get total price for a ManyToManyField. I'm getting each individual price on price_for_each_item and then I want the total of however many items were in that to be added to 'total_pric...

About UNIX Resources Network

Original, collect and organize Developers related documents, information and materials, contains jQuery, Html, CSS, MySQL, .NET, ASP.NET, SQL, objective-c, iPhone, Ruby on Rails, C, SQL Server, Ruby, Arrays, Regex, ASP.NET MVC, WPF, XML, Ajax, DataBase, and so on.