# How to pull/merge updates from Trellis remote (master) in case of major changes?

**URL:** https://discourse.roots.io/t/how-to-pull-merge-updates-from-trellis-remote-master-in-case-of-major-changes/6387
**Category:** trellis
**Created:** 2016-04-06T07:13:06Z
**Posts:** 4

## Post 1 by @frankis — 2016-04-06T07:13:06Z

I have read several threads in here but none seems to provide a real solution to the problem on how to create a reliable workflow that not only covers pushing the repo to the “own” remote but also resolves the question on how to integrate the trellis remote master as “subtree” / “subrepo” (or whatever it is called).

1. I wonder if someone already tried [subrepo](https://github.com/ingydotnet/git-subrepo#readme) and if that brought any improvements?
2. Is there any more detailed documentation/tutorial maybe even visual flowchart explaining what actually is the right way in such scenarios?

---

## Post 2 by @RiFi2k — 2016-04-06T11:27:44Z

Just for curiosity sake. Is there a particular reason to not keep everything in its own repo? Seems way cleaner to me that way and if you wanted them both in the same folder it only take 2 commands, possibly 3 if you need to create the folder.

---

## Post 3 by @richardwilis — 2016-04-06T13:13:18Z

The subtree method as detailed [here](https://discourse.roots.io/t/best-practices-to-update-trellis/5386/6) works for me.

---

## Post 4 by @Simeon — 2017-01-19T05:26:55Z

Fast-forward 287 days … is this still the best method for updating Trellis? I feel like keeping Trellis is something I’m still not comfortable/knowledgable with.
