<div>
My guess is that there are changes in files on both sides you need to merge. Do you see any changes to merge in the editor?
</div>


My guess is that there are changes in files on both sides you need to merge. Do you see any changes to merge in the editor?

<div>
Do a 'git fetch' first then try pull.<br />
You have local changes, so it is asking for merging during pull.
</div>


Do a 'git fetch' first then try pull.
You have local changes, so it is asking for merging during pull.

Rohit Bajaj

<div>
<div class="content wysiwyg-content">
Hi,<br />
I have noticed sometimes whenever i do a git pull.<br />
The editor will open up for merging with the default message : <br />
Merge branch 'branch-name' of 10.1.5.12:app-portal into 'branch_name'<br />
And i unnecessarily end up creating a new commit.<br />
<br />
I dont know why this is happening ?<br />
Ideally when i do a git pull it should just pull out the changes and not merge something... <br />
Moreover why this message is appearing in the commit ?<br />
<br />
Thanks
</div>
</div>


Hi,
I have noticed sometimes whenever i do a git pull.
The editor will open up for merging with the default message : 
Merge branch 'branch-name' of 10.1.5.12:app-portal into 'branch_name'
And i unnecessarily end up creating a new commit.

I dont know why this is happening ?
Ideally when i do a git pull it should just pull out the changes and not merge something... 
Moreover why this message is appearing in the commit ?

Thanks

Git pull causing merging and a default message appearing

Git is a version control system for software development. It is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed for Linux kernel development. As with most other distributed version control systems, every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server.

Programming includes both the specifics of the language you’re using, like Visual Basic, .NET, Java and others, but also the best practices in user experience and interfaces and the management of projects, version control and development. Other programming topics are related to web and cloud development and system and hardware programming.

Programming

Software is any set of instructions that directs a computer to perform specific tasks or operations. Computer software consists of programs, libraries and related non-executable data (such as documentation). Computer software is non-tangible, contrasted with computer hardware, which is the physical component of computers. Software written in a machine language is known as "machine code". However, in practice, software is usually written in high-level programming languages than machine language. High-level languages are translated into machine language using a compiler or interpreter or a combination of the two.

Software

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.