> For the complete documentation index, see [llms.txt](https://docs.arkannis.net/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://docs.arkannis.net/devops/git/git-commit-changes-before-merge.md).

# Git Commit changes before merge

{% hint style="info" %}
You can't merge with local modifications. Git protects you from losing potentially important changes.
{% endhint %}

### You have three options:

#### Commit the change using

```bash
git commit -m "My message"
```

#### Stash it

Stashing acts as a stack, where you can push changes, and you pop them in reverse order.

To stash, type

```bash
git stash
```

Do the merge, and then pull the stash:

```bash
git stash pop
```

#### Discard the local changes

```bash
using git reset --hard
```

or

```bash
git checkout -t -f remote/branch
```

Or: Discard local changes for a specific file using git checkout filename


---

# Agent Instructions
This documentation is published with GitBook. GitBook is the documentation platform designed so that both humans and AI agents can read, navigate, and reason over technical content effectively. Learn more at gitbook.com.

## Querying This Documentation
If you need additional information that is not directly available in this page, you can query the documentation dynamically by asking a question.

Perform an HTTP GET request on the current page URL with the `ask` query parameter, and the optional `goal` query parameter:

```
GET https://docs.arkannis.net/devops/git/git-commit-changes-before-merge.md?ask=<question>&goal=<endgoal>
```

`ask` is the immediate question: it should be specific, self-contained, and written in natural language.
`goal` is optional and describes the broader end goal you are ultimately trying to accomplish on behalf of the user. GitBook uses it to tailor the answer towards what is most useful for that goal.

The response will contain a direct answer to the question and relevant excerpts and sources from the documentation.

Use this mechanism when the answer is not explicitly present in the current page, you need clarification or additional context, or you want to retrieve related documentation sections.