LogoLogo
  • Overview
    • Introduction
      • Git-Based Source Control
      • DeviceLink
    • System Requirements
    • Supported Vendors and Device Types
    • Glossary
  • Git-Based Source Control
    • Getting Started
      • Planning
      • Initial Setup
        • Migrations
    • Basic Tasks
      • Navigation
        • Home page
        • Exploring the Web App
        • Exploring the Desktop App
      • Configuration
        • Creating Repositories
        • Creating Templates
        • Cloning Repositories
      • Operations
        • Pulling
        • Committing
        • Pushing
        • Managing History
        • Binary & Large Files
    • Advanced Tasks
      • Branching
        • Branch Protections
      • Pull Requests & Code Review
        • Contributors
        • Reviewers
      • Merging
    • Additional Features
      • Topics
      • Issues
        • Milestones
        • Labels
        • References and Links
      • Wiki
      • Tags & Releases
      • Webhooks
      • Activity
    • Administration
      • Org Settings
      • User Management
        • External Identity Management (SSO + SCIM)
      • Teams & Permissions
        • Permissions by Account Type
      • Registration & Billing
      • Repo Settings
      • Desktop App Options
      • Profile and Settings
        • Notifications
        • Two-Factor Authentication (2FA)
    • Supported Vendors
      • ABB
      • Beckhoff
      • B&R Automation
      • CODESYS
      • Inductive
      • Lenze
      • Rockwell
        • RSLogix 500
        • RSLogix 5000
        • Studio 5000 Logix Designer
      • Schneider
        • Control Expert
        • Machine Expert
      • Siemens
        • Siemens Step7 TIA Portal
        • Siemens Step7 5.x
      • WAGO
    • Integrations
      • Discord
      • Jira
      • Microsoft Teams Connectors
      • Slack
      • Zapier
      • Microsoft Teams Workflows
  • DeviceLink
    • Getting Started
      • Architecture
      • Planning & Installation
    • Sites and Agents
      • Sites
        • Site Settings
        • File Lists
        • Graphs and Metrics
      • Agents
        • Creating a Site-Based Agent
        • Creating a Multi-Site Agent
    • Projects and Devices
    • Vendor Configuration
      • Beckhoff TwinCAT 3
      • CODESYS v3
      • Copia FTP
      • Copia sFTP/SCP
      • Copia Scripting
      • FANUC Robots
      • Rockwell RSLogix 500
        • Smart Filter
      • Rockwell Studio/RSLogix 5000
        • Smart Filter
      • Rockwell PanelView ME HMI
      • Schneider Control Expert
      • Siemens Step7 TIA Portal
      • Siemens Step7 5.x
    • Jobs
      • Job Navigation
      • Creating Jobs
      • Managing Jobs and History
      • Manual Backups
      • Pull Requests
    • Additional Features
      • Webhooks
      • Copia Import Tool
        • Getting Started
        • Preparing your data
        • Importing your data
        • Rolling back a prior import
    • Administration
      • Teams
      • Permissions
      • Notifications
  • Copilot
    • Copia Copilot
    • Getting Started
    • Using Copia Copilot
  • Copilot FAQ
  • Support
    • Best Practices
    • FAQs
      • Git-Based Source Control
        • Troubleshooting
      • DeviceLink
        • Troubleshooting
Powered by GitBook
On this page
  • Overview
  • Pulling
  • Pulling when No Local Changes Exist
  • Pulling when Local Changes Exist
  • Managing Merge Conflicts

Was this helpful?

  1. Git-Based Source Control
  2. Basic Tasks
  3. Operations

Pulling

PreviousOperationsNextCommitting

Last updated 2 years ago

Was this helpful?

Overview

Pulling gives you a local snapshot of your remote repository. It is automatically performed after you clone. It is an operation performed via the Copia Desktop App on your local PC.

Each time you intend to make changes to a repository from a given machine, you'll want to pull changes locally. This way, multiple engineers from the same team can reference and collaborate on the same remote repository.

Pulling

Once you start to collaborate with other users, you'll both be making changes to the same repository and often at the same time. In order to stay synchronized, you should make a habit of always pulling before pushing. This gives you an opportunity to check for remote changes before you try to push changes you've made locally, and it ensures that your local repository will always be up to date with what's on Copia's servers.

Pulling when No Local Changes Exist

Pulling changes when you have no local changes is straightforward.

To pull changes from the Copia server, press the Fetch Origin button. The Desktop App will check the remote repository for any changes.

This fetching operation only checks the remote repository; it doesn't bring in the changes locally. You therefore still need to pull the remote changes. To do so, press either of the Pull Origin buttons.

Pulling when Local Changes Exist

If you've made changes locally and in that time someone else on your team has also pushed their change to remote, you will first need to commit (or save your change) locally, and then pull changes from remote.

Managing Merge Conflicts

At times, when you attempt to pull, you'll discover that you've modified a file that someone else has already modified. You'll get the following warning.

You'll want to select your local version (the option NOT prefixed with origin/) and merge the files in. This will create a new commit. You can then navigate to the History tab to understand what you changed. We recommend you create another commit with the changes from remote that you overrode before pushing.

To learn more about commits, check out the section.

While this process can be confusing, we recommend that you begin to use , , and flow which make it much cleaner to compare changes and resolve merge conflicts.

Committing
branching
code review
merging